Merge changes Ib202fd5c,I5d0fa5d5 am: bab6ddb6ad am: d35600ed13

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1989127

Change-Id: I84ede95633982a22de0b963833f595cf378670e8