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

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

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



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