Merge changes I1f676dbf,I622757fc am: d69bd1e5 am: 39e10bfd am: 1f8d64c1...

Merge changes I1f676dbf,I622757fc am: d69bd1e5 am: 39e10bfd am: 1f8d64c1 am: b381072c am: a057844d

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



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