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: I90ca8eb614f4190f0d58dafb8d5e71336fd4f1ae