Merge "Add ability to handle multiple intercepts per pid." into main am:...

Merge "Add ability to handle multiple intercepts per pid." into main am: 2ae67e71 am: fcd4f3b5 am: b1ca4874

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2795812



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