Merge "Allow readability-identifier-length warnings" am: 8cc0f40cf2 am: 75c39b2515 am: be3d5337e6

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

Change-Id: I19d6cac46b0f46c791decfc1a981c8585ad8ac29