Merge changes I93d05034,Ic052133c into rvc-dev am: b13bd0e90e

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

Change-Id: Idbc9969cebcdaf16fe522be241ead6a1b735de96