Merge changes I1a7083e8,Ia4ddb102 am: c9f440a8 am: bc5b17fa am: a30de882...

Merge changes I1a7083e8,Ia4ddb102 am: c9f440a8 am: bc5b17fa am: a30de882 am: 1c5ed851 am: 7919ab5a

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



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