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

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

Change-Id: Ia3a915941edebdeaddf72a43d41d9049fd4828fb