Merge changes Ic4716ad0,I12d04de8 am: 8bc65eac8e am: e184eba37e

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

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