Merge changes Ibfa0535f,Idc771d8e am: 6bbc472a am: 94523918 am: f33abc0f...

Merge changes Ibfa0535f,Idc771d8e am: 6bbc472a am: 94523918 am: f33abc0f am: d5b405f3 am: 5fb57fa9

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



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