Merge changes I3320d992,I655cf2c2 am: c8370a9c am: 5a52bcc7 am: 3bf4a472 am: 4fbe605b

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



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