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

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



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