Merge changes I914fa057,I89ad4e2e am: b84297d910

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

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