[automerger skipped] Merge changes Ia14551e0,Idd32600c,I694e2aa5 am: 69ff6776 am: e9b1e968 am: 05593c3a -s ours

am skip reason: Merged-In Ia14551e000ee1651a04ab580c4df2afcb2f8edeb with SHA-1 3ef084b1 is already in history

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

Change-Id: I04d682cf28865339515812a855d6ebd59cf40d85