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

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

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