Merge changes I63739a0d,I62ec7bf0 am: b326ca5502

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

Change-Id: I9e64dc4642b1a9ba9df34f200026c7a4ebeeb359