Merge changes Ic4716ad0,I12d04de8 am: 8bc65eac am: e184eba3 am: e14bed49...

Merge changes Ic4716ad0,I12d04de8 am: 8bc65eac am: e184eba3 am: e14bed49 am: 82412c27 am: b0a61b0f

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



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