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

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



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