Merge "Allow readability-identifier-length warnings" am: 8cc0f40c am:...

Merge "Allow readability-identifier-length warnings" am: 8cc0f40c am: 75c39b25 am: be3d5337 am: c5f75d37 am: 421cfbcb

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

Change-Id: Iabf27c136ab6c91ab30b904e635f3c9b3694bf70