Merge changes I118d5c8d,I9c3728cd am: 3bbf1f41fd am: 21951c8eb7 am: 63c3034c5c

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

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