Merge "Reformat two Kotlin files I mistakenly formatted with IntelliJ" into...

Merge "Reformat two Kotlin files I mistakenly formatted with IntelliJ" into tm-qpr-dev am: fccadc85 am: bef27906

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



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