Merge changes Ib202fd5c,I5d0fa5d5 am: bab6ddb6ad am: d35600ed13 am: ed593ec7a9 am: 9848c17b91 am: c58ee1a3db

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

Change-Id: I85de46ac19eab02ece65a539b599a608a3dd5392