Merge changes If163fe2a,Ib736cc16 am: 9e350221 am: a1618f31 am: acb9c3da...

Merge changes If163fe2a,Ib736cc16 am: 9e350221 am: a1618f31 am: acb9c3da am: 2e33fc79 am: ec8c2688

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



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