[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-fef7239ebf7e457fb16bc495685f80cb" into tm-qpr-dev-plus-aosp am: d44350fc -s ours am: 4055fd71 -s ours

am skip reason: Merged-In I76427c0064c9935c76e3ec8662d6b7955bcbfd2b with SHA-1 ae4dec81 is already in history

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



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