tree 24b7086cedf2e715319905baa9ff6c4c4895f12e
parent e41acf91280710b5b13a4be2db60b2a4cec4a841
parent 945fca327cef05185616385dedad00c356ca157d
author Evan Severson <evanseverson@google.com> 1662703262 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1662703262 +0000

[automerger skipped] Merge changes from topic "presubmit-am-77aaf4d1c96d4bd0bf1f886d74ab8a9c" into sc-qpr1-dev am: 7493908364 am: b45d936f2f -s ours am: 945fca327c -s ours

am skip reason: Merged-In Ib4fafe2423c7ded1daf1b763f8103601c0e2c852 with SHA-1 0eee4fa476 is already in history

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

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