[automerger skipped] cleanupOrphanPA's feature (1/2)* am: ad6fdf55 -s ours am: 98f35777 -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: I884ab2455204af7848c6ec3435171dab0d972a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>