Merge changes I166f3d78,I026a8bb4 am: 589958c2 am: c2e8b281 am: 8a8db246...

Merge changes I166f3d78,I026a8bb4 am: 589958c2 am: c2e8b281 am: 8a8db246 am: 5d09a038 am: 6eb82f88

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



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