Merge changes I49911f5e,I2204b66b am: e003d9ed84 am: 2d0177332b am: 0a82a928fa am: d1c411f46b

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

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