Merge "enforce_permission_counter: Find targets automatically" into main am: f964854d1f am: 26dd685953 am: 6318b81e8b am: d5762de0eb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2761525

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