[automerger skipped] Merge "cleanupOrphanPA's feature framework (2/2)*" am: 2c2ef9a04a -s ours am: 840f2a30e9 -s ours
am skip reason: Merged-In Ic350e4e45c0d1597c6f61e3e3e717b3a2c1bb099 with SHA-1 c8460d8e21 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2161298
Change-Id: Ia43fd8a32e28c5c52987f18b0922d14d9afe1f5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: