Merge \"Adding custom manifest shortcuts in Settings app\" into nyc-mr1-dev
am: 139fbb78b5

Change-Id: I0dbe76be67dfe27f7e0a28d6a2eeb7da97cec19a