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

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

Change-Id: I44d1b684d2a177b71c2a0aa64bd19d5fd1ba7b14