Merge changes Ie04465ce,I29bbbd27 am: 78a58c8af4

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

Change-Id: I867065e8ebca6aa63da29df7e15c9db1a55bf0d2