Merge changes Ie98c9fec,I2de6bc77 am: 3f242853cd

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

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