Merge "Merge "Revert "Temporarily disable checkstyle hook"" into rvc-dev am: d9df6c3024 am: 1d4959b110 am: 6fcdf94948" into rvc-qpr-dev-plus-aosp am: bb7999915f

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

Change-Id: I5c21bd5f21f5633f8f8f9bca50212607042bbea1