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

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

Change-Id: I05d419414decd87f3d2581a82ba34d490a4749f5