[automerger skipped] Merge changes Ida831e19,I3b74e343,I966c76b0 am: 27223c51a4 am: 184dcb82cc am: cc9aeb2682 -s ours am: a95dc05a92 -s ours am: 328ef6ac1a -s ours

am skip reason: Merged-In Ida831e19203181f9e59eb447f4d03fac683e1019 with SHA-1 4ee18ae8d0 is already in history

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

Change-Id: Ic07d0041be0392e38bff865fd1ea590b3188a5b0