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

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

Change-Id: I0990aab86066739acef8cb56c49bbe7f40fa96dc