Merge changes I7753858b,I7aebe80d am: dcc3db7b am: 514da40e am: b4136b24...

Merge changes I7753858b,I7aebe80d am: dcc3db7b am: 514da40e am: b4136b24 am: 9fed2f4b am: 1177c9fd

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



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