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

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

Change-Id: I9492ab6301730b474c155e6f484c8acff182e789