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

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

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