Merge changes Ida831e19,I3b74e343,I966c76b0 am: 27223c51a4

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

Change-Id: Ibab979da42a5b08b39dc2cb67b4752e4f5feaae6