Merge changes I5160e72b,I54ff0c8e am: c59b49c3cd am: 637ee9248f am: 9c9ffe6208 am: 079854e8d1

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

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