Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a881 am: b9ed45c308

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

Change-Id: I1321068313d41b110fa87c9ac0d2198bba476950