Merge "Fixing some lint errors." into tm-dev am: 8a3aa304

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



Change-Id: I1a49aefd0c62c0eae6290616a480b459eed485b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>