Merge "Merge "Temporarily disable checkstyle hook" into rvc-dev am: 17f8a7e5...

Merge "Merge "Temporarily disable checkstyle hook" into rvc-dev am: 17f8a7e5 am: a65a36bf am: b9caacda" into rvc-qpr-dev-plus-aosp am: df3902c0

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

Change-Id: I9b19ea13fc0ea4a2a3c23a00b54c8aea5ed2132f