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

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



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