Merge changes Idce05e13,Ie9920192 am: 37f927d0bd am: 5d31552866 am: dd0954ba04

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

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