Merge changes Ia3eae81c,Iff44fb23 am: 372c4810c7

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

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