Merge changes from topic "tids_and_pids" am: 637a8a4b am: d476f7b7 am:...

Merge changes from topic "tids_and_pids" am: 637a8a4b am: d476f7b7 am: f81cc9bd am: aa1b171c am: 0032f224

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



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