Merge changes If955ca61,I5eea619e am: f7652a0d am: ae30141e am: ed8d7822...

Merge changes If955ca61,I5eea619e am: f7652a0d am: ae30141e am: ed8d7822 am: c0ef84ad am: ae8940e2

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



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