Merge changes Id8fc889f,I2145ad0e am: 5426122b9b am: 08cb54f49d am: da55afdbd4

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

Change-Id: I22ca3bb1e715017eb3378f2e4a0f3a09b2331de5