Merge changes Ic46ac54b,Id787e70f am: dfb9cd9d50 am: f8efb4767a

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

Change-Id: Ide4cdfd3d641477270cef00b0852b02d81051234