tree 8059977dc0c696029bebb8f3210b829b617e3839
parent fe9d1d5eb184266cd70d71d753487a0e44530bd9
parent 8c4224a07035db1e9ba636eca52c14fd54a3d984
author TreeHugger Robot <treehugger-gerrit@google.com> 1594959602 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594959602 +0000

Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8c4224a070

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

Change-Id: I3ef578b89e712915cca0137bea346c1e5f7fe78b