Merge changes I93d05034,Ic052133c into rvc-dev am: b13bd0e9 am: 0f8e0b00 am: 160d34c4 am: f2a57e18

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

Change-Id: I36200feb705920f3a9a9225b00e5a5ff8e4a842f