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

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

Change-Id: I71ea683eb324ee070d6a3025df27a58f23dce28c