tree 8e1c8c094eafc9e95ba3a0102f84144cb05c7b75
parent 1922ce9f3b9b9611df59cdd1ebd545c4beb16dc2
parent ef813789323972b78a1290f8fe74310063f41c8a
author TreeHugger Robot <treehugger-gerrit@google.com> 1594958599 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594958599 +0000

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

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

Change-Id: I5cd61dd963ab57273ce6ee457c02bd6e10383f1c