cleanupOrphanPA's feature (1/2)*

Bug: 210134615
Test: Unit + manual
Change-Id: Ide6fc11a3ce8b2d1a911c4886f07f383db9424bc
Merged-In: Ide6fc11a3ce8b2d1a911c4886f07f383db9424bc
3 files changed