tree 7b597a739183c50260eb073cac2e9336399e861f
parent 8d6b5c8d6faf51ec5250ea13dcc9a0f3877d2c42
parent 7d7b5bcb9f6da86ac1f363c21d833dc6afdc830a
author Bill Yi <byi@google.com> 1618363808 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618363808 +0000

[automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: 32cf6f6f6b -s ours am: 7d7b5bcb9f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib1d72d31954f31f9f1cefa3bd557c5bce3fb6f9e