tree 1dd1152e98e2e767ab2fe90684fa97cef51d8376
parent fee2e7854789b8858e5d6551fdc4cf2f2cd0c11b
parent 673ddf61885e8d814d605b5c21ceb28fe076bcc4
author Jing Ji <jji@google.com> 1668466460 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1668466460 +0000

Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0dd am: 673ddf6188

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

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