Merge changes Ib83141bd,Iaaba87a2 into tm-dev am: e9d6733f am: 746592d0...

Merge changes Ib83141bd,Iaaba87a2 into tm-dev am: e9d6733f am: 746592d0 am: b7911cc2 am: 0acbb4d6

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



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