tree 01a73309d18faeafe9cf47b7854dbbae8cbf7b0d
parent 9aa59e6917c887b1b91ffcc3f07aae5045fb215b
parent c3d6c2815acb982cf3e24b7476ddf936c095fd36
author TreeHugger Robot <treehugger-gerrit@google.com> 1592896872 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592896872 +0000

Merge changes I30a2fa4f,I1abd1561 into rvc-dev am: 5bbeb33ec9 am: c3d6c2815a

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

Change-Id: Ic115b5da13e989272c761858734b484b21618716