Merge changes I118d5c8d,I9c3728cd am: 3bbf1f41fd

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

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