Merge changes Ida831e19,I3b74e343,I966c76b0 am: 27223c51a4 am: 184dcb82cc

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

Change-Id: Ia89bd6e813dc8cd615dce59fb84e252d6a4e6eef