Merge changes I43269b24,I94c953e0 am: 6e3c7eb4 am: fa768757 am: a0d7cd87 am: 0f19b5f5

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



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