Merge changes from topic "tids_and_pids" am: 637a8a4b41

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

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