Merge changes Ib202fd5c,I5d0fa5d5 am: bab6ddb6ad am: d35600ed13 am: ed593ec7a9

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

Change-Id: I563cbc758da903f306a12008ebc8fdfbe221dde7