Merge changes Id6f98191,Id9430ca8,Idde11124 am: 8b1701f4fa am: 42594d1257

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

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