Merge changes I4e5db32c,I2a448282 am: 5b4e68d756

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

Change-Id: I20c55e730a1e181748ce893e3677b73993b79e02