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