Merge "Automatic reformatting by ktlint.py" into tm-qpr-dev am: bba05dfecc

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

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