Merge changes Id6f98191,Id9430ca8,Idde11124 am: 8b1701f4fa

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

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