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

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

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