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

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



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