Merge changes I17399680,I4952b3ab,I743b6227 am: f110de513b

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

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