Merge changes I63739a0d,I62ec7bf0 am: b326ca5502 am: a111e64689

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

Change-Id: I928b3707c967f97692c00b01449731eec2771212