Merge changes I7753858b,I7aebe80d am: dcc3db7bd1 am: 514da40ecf

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

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