Merge "Update linter formatting, add new tests" into tm-qpr-dev am: b1eebad6

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



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