Merge changes Icbd72470,I57580933 am: c093f5ddca am: 2e4c43c4d4

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

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