[automerger skipped] Not using Settings app as a source of shortcuts
am: b96898a025 -s ours
am skip reason: SHA1 b96898a025 skipped by user vadimt

Change-Id: I9e1db9877a98b3a45c5304958fcf95c327f2f76c