Merge changes I49911f5e,I2204b66b am: e003d9ed84 am: 2d0177332b am: 0a82a928fa am: d1c411f46b am: cfe5fdf790

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>