Merge changes Ib202fd5c,I5d0fa5d5 am: bab6ddb6ad

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

Change-Id: Ic853dd9d8c61a87d5708371a0912d9f40df2db40