[automerger skipped] Merge "cleanupOrphanPA's feature (1/2)*" am: ec8384e3 -s ours

am skip reason: Merged-In Ide6fc11a3ce8b2d1a911c4886f07f383db9424bc with SHA-1 dd5d1179 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2161776



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