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

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

Change-Id: I14d0e4d5efc2668e2db0b62b5df765db92c5f29b