Merge changes I0d6020ef,I2923b255 am: 491e845171 am: fb5ccc485f

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

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