Merge changes from topic "tids_and_pids" am: 637a8a4b41 am: d476f7b7b6 am: f81cc9bd90

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

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