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

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

Change-Id: I15e8efeee50116b287e084bc856b8062313c17ee