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

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

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