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

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



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