tree b5cfb625593ee76970cf6ed8d3481222c73f7a0f
parent 1aebc33d8dae4c891a5b7dc5f9917882fbe098ae
parent 756576f0437e09e1df4a80a1a635aa9881c5697e
author TreeHugger Robot <treehugger-gerrit@google.com> 1594959588 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594959588 +0000

Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 756576f043

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

Change-Id: I55405a76b8eb3ab7833d0521f6cea5d3b2f3de44