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

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

Change-Id: Ie303c6ddcb209d1b5053a9936d92d7facd8f8461