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

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

Change-Id: I56cdd410bb656b2824c00d3bb252fb870422bd94