Merge "Dedup apex-scanning" into main am: 5a2d8514 am: 00144f0a am:...

Merge "Dedup apex-scanning" into main am: 5a2d8514 am: 00144f0a am: 5f05732c am: 5b89d16a am: 5bcce338

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



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