tree 170e183eb379151fc749a3c8f023b1d2ca6da60d
parent eb8c8adcd5841d128e79c7ff17d31b464a364241
parent 315a3641a3791c149ebe4fcf0ea95a814df1f8e9
author Bill Yi <byi@google.com> 1641580448 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641580448 +0000

[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: aa301c6fc8 -s ours am: e8c5cbfd5b -s ours am: 315a3641a3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I232428ea53113f751280df92bbf77fb7a74d9070