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

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

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