[automerger skipped] Merge "[DO NOT MERGE] Resolve file inconsistencies...

[automerger skipped] Merge "[DO NOT MERGE] Resolve file inconsistencies between master and tm-qpr-dev" into tm-qpr-dev am: 60e003dd am: c6b0ab5a -s ours

am skip reason: subject contains skip directive

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



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