Merge "Small follow up lint fixes for ag/17071393" into tm-dev am: f16b5fb3

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

Change-Id: If5c1784772b16f30032459f47a66b55e83b4349b