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

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

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