[automerger skipped] Merge changes Ic879c4c2,Ib8776101 am: 69e22e9e am:...

[automerger skipped] Merge changes Ic879c4c2,Ib8776101 am: 69e22e9e am: 08fae357 am: e40a8e99 -s ours am: 40c0286e -s ours

am skip reason: Merged-In Ic879c4c2cf81d317030690dff20b21ea7255425b with SHA-1 33e3baa3 is already in history

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



Change-Id: I5d7a073aa9c42235979680e7a5d77a1075d05fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>