Merge changes I4e5db32c,I2a448282 am: 5b4e68d756 am: 021cae6f1a

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

Change-Id: I942835670e7ffe0d64f175ba66e0d2c5f8cbe209