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

Merge "Merge "Temporarily disable checkstyle hook" into rvc-dev am: 17f8a7e5 am: 40d7c187" into rvc-d1-dev-plus-aosp am: fec04fd0

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

Change-Id: Ic4b1b916d011c44705abb9b30d41475d25404bbe