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

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

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