[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-738643938b434f49a2ccdaf2bea6e484" into tm-qpr-dev-plus-aosp am: 1ac2f1c0 -s ours

am skip reason: Merged-In I0b4a480c6e85133f2d0d30042603009cc94db9c0 with SHA-1 871e2235 is already in history

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



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