Merge changes Ie9fa8c9c,I9773a4cf am: ece7023082

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

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