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

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

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



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