tree 1cdf2797ca6930b37cea2f5bcc682ed4d572a7be
parent 0f61b833d544b6cf514e0b6a79530699bfe83e0c
parent 8399e3d5eb8c2ea0d4c550071614f28a51035b86
author Xin Li <delphij@google.com> 1598992623 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992623 +0000

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours

am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history

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

Change-Id: I6fee791ed4a4939ab3f24b66f779a20124d0c63d