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

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

Change-Id: I494a07b37dc120e8f1f25bf979f696898ab3ab3f