Merge changes I7ea231db,I2e8e89f8 am: b02d5009c1

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

Change-Id: Iedb80961bb0773045243ae4a7222f4adf4750bb3