tree 765df33e6bf698d06d88e159b734afef805adac1
parent d084c0202a6d9ac7561bbc62eb6d0e8cf15bce2d
parent b99672c02083c2ba7d6e33d0750c5cc6665d5404
author Bill Yi <byi@google.com> 1641577730 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1641577730 +0000

[automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: b99672c020 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68d1975f5538f2a6aeb5dcc64a09d1f230af9aea