tree 05fd61c8978a240de10b13d43aabc7f173da2396
parent 694f6bec924ddcbcd665029a82a9708b4681a38b
parent b954794dc7478088e87bb3d5e1822418dd7f64c2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594694673 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594694673 +0000

Merge changes from topic "am-e267200dd53f48d0a5b1442334855c47" into rvc-d1-dev-plus-aosp am: b954794dc7

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

Change-Id: Ib57edecfce774e581013e4a07a4754c6a3b0298a