Merge changes Ic46ac54b,Id787e70f am: dfb9cd9d50 am: f8efb4767a am: 6ad7d0aae7

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

Change-Id: Id94a2505624671b18a9be9567a676953da366d5a