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

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

Change-Id: Iae66e4d73f6e42d705a9a0f425eee12aef73f9e3