Merge changes I49911f5e,I2204b66b am: e003d9ed am: 2d017733 am: 0a82a928...

Merge changes I49911f5e,I2204b66b am: e003d9ed am: 2d017733 am: 0a82a928 am: d1c411f4 am: cfe5fdf7

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



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