Merge "Revert "Temporarily disable checkstyle hook"" into rvc-dev am: d9df6c3024 am: 1d4959b110

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

Change-Id: Iddc839fd3e75924f5b9aa7630ca625a18f0272c0