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

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

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