tree fe928af1e89fe11d1f0f810e6869da70b9098e38
parent af1089e8da0faaf153f1edd2e32e9305d4f8588c
parent 523608f2032451fd9d432e8f9f1eeeab44dc269d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598579197 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598579197 +0000

[automerger skipped] Merge changes from topic "am-4f55cf354ee849c8a9efbca3e14ade7f" into rvc-d1-dev-plus-aosp am: 6811659f34 -s ours am: 523608f203 -s ours

am skip reason: Change-Id I200d85085ce79842a3ed39377d1f75ec381c8991 with SHA-1 55b676bc4f is in history

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

Change-Id: Ief39a66e429fcfc81a41aa28e6b371767752cb1a