Merge "Revert "Temporarily disable checkstyle hook"" into rvc-dev am: d9df6c30 am: 1d4959b1

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

Change-Id: I3f733ba076c7b372d026c05eb43c55fc54059406