Merge "Remove persistentPreferrredActivity policy on activity removal" into...

Merge "Remove persistentPreferrredActivity policy on activity removal" into udc-dev am: 7cc9a4bb am: e891421c am: f088c9e5

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



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