Merge changes Ifc3708c1,If07045c1 am: 61c79dbc8d am: 41fc427c40 am: be9cdaf9c9

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

Change-Id: I092e7a5c3f911c3fcc782b5e5643d9863520e407