Merge "Update code style for easier merging" into tm-qpr-dev am: 6ae3e60f am: 2fae24e6

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



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