Merge changes Ie98c9fec,I2de6bc77 am: 3f242853cd am: 00d9ad4444

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

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