Merge "Use touch usage on camera shortcut vibration" into sc-dev am: 831024c8 am: eef3d751

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15328598

Change-Id: Ifd0e17921510964679c129e2508ec4e8e6175bfa