Merge changes Ifc3708c1,If07045c1 am: 61c79dbc8d

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

Change-Id: Ibeaec84460b6953ce6567e8694f3d1593d714253