[automerger skipped] [DO NOT MERGE] Resolve file inconsistencies between...

[automerger skipped] [DO NOT MERGE] Resolve file inconsistencies between master and tm-qpr-dev am: 3140d353 am: 4942e374 -s ours

am skip reason: subject contains skip directive

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



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