Merge changes I252f3b20,I0bfff9b4 am: 754efd77 am: 2b7e126e am: 5532fc23...

Merge changes I252f3b20,I0bfff9b4 am: 754efd77 am: 2b7e126e am: 5532fc23 am: 258ef1f4 am: 03a81d70

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



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