Merge changes Ib83141bd,Iaaba87a2 into tm-dev am: e9d6733f am: 2c050278...

Merge changes Ib83141bd,Iaaba87a2 into tm-dev am: e9d6733f am: 2c050278 am: e6cb98e1 am: f56135fc

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



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