Merge changes Ifbb6579b,Ibf0ed0b8,I0f0decfb into rvc-dev am: 28d11e0b am: ede9a50a am: bd49dd95 am: acb89927

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

Change-Id: I87d351caef07541f2cbc24b39a9ba88e22d77e78