Merge changes I5160e72b,I54ff0c8e am: c59b49c3 am: 637ee924 am: 9c9ffe62...

Merge changes I5160e72b,I54ff0c8e am: c59b49c3 am: 637ee924 am: 9c9ffe62 am: 079854e8 am: f2e15366

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



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