Merge changes I166f3d78,I026a8bb4 am: 589958c217 am: c2e8b2812d am: 8a8db246d9

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

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