cleanupOrphanPA's feature framework (2/2)*

Bug: 210134615
Test: Unit + manual
Change-Id: Ic350e4e45c0d1597c6f61e3e3e717b3a2c1bb099
2 files changed