[automerger skipped] Merge changes from topic "presubmit-am-e1291358894f4d2780fd24b49ec03274" into tm-qpr-dev-plus-aosp am: 1fcacc42 -s ours am: 064c589d -s ours am: bcc23bb1 -s ours

am skip reason: Merged-In I11cc741cac0147b080985351b8e66d53b370289c with SHA-1 73a7daa4 is already in history

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



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