Merge changes Icbd72470,I57580933 am: c093f5ddca

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

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