tree d0ab0c60859fa8c8ef066f9fe17794068b3d2cc7
parent 760200b6800217aefc734359df0aa543c0664388
parent ac48de65c2049b76d8d0fac905f4b6304c6c72df
author Henry Fang <quxiangfang@google.com> 1591293840 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591293840 +0000

Merge changes I9f8ce2e5,I3142b073 into rvc-dev am: 084e7473fb am: 371fd5474d am: fd84736da4 am: ac48de65c2

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

Change-Id: Idb627109f194974e20753697b4d24310780161bf