Merge changes I14688f7b,I2c5de9d3 into tm-dev am: 3f6ac9e07f am: f2663c61a0

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

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