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

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

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