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

am skip reason: Merged-In Ic350e4e45c0d1597c6f61e3e3e717b3a2c1bb099 with SHA-1 c8460d8e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2161298



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