[automerger skipped] Merge changes from topic "presubmit-am-cf2f51fcc9a649cf9c8e27061e88ec3e" into tm-qpr-dev-plus-aosp am: 3af1633d59 -s ours
am skip reason: Merged-In Ib4eef40a0f59512c669b069532e55d36293f9e1c with SHA-1 61c6447241 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23103421
Change-Id: Iba078db2dac0c926ae7e881a36d960cf36f2b80b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: