Merge changes I914fa057,I89ad4e2e am: b84297d9 am: 5de63715 am: 6004b417...

Merge changes I914fa057,I89ad4e2e am: b84297d9 am: 5de63715 am: 6004b417 am: 420f9717 am: 98c0c8bd

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



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