tree bd116ec6cf8216fd61ecddbd45aac712a8f15c01
parent 50fd6d5d0949e8a1747e6eec7b29d0c1b92c9223
parent 7e407ef9cb6419870fc7965981e16b03f12247f4
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604977182 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604977182 +0000

Merge changes from topic "am-ff421f5c678447bf80a4adf729e40d01" into rvc-qpr-dev-plus-aosp am: 7e407ef9cb

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

Change-Id: I16fb1909bf37ea3ca95814d412309618757079e4