Merge "enforce_permission_counter: Find targets automatically" into main am: f964854d

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



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