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

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

Change-Id: I3254b9b32c9130c3d58a714a7cc791e27de75fce