Merge changes I7753858b,I7aebe80d am: dcc3db7bd1

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

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