Merge changes I2637e526,I340fa7ee am: c71b8b96 am: 5555ffd2 am: 69a6f41c...

Merge changes I2637e526,I340fa7ee am: c71b8b96 am: 5555ffd2 am: 69a6f41c am: 2df23404 am: e0ce3019

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



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