Merge changes Ic4716ad0,I12d04de8 am: 8bc65eac8e

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

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