Merge changes I43269b24,I94c953e0 am: 6e3c7eb45e am: fa768757a7 am: a0d7cd872c

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

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