Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev am:...

Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev am: 39715d30 am: 3362abc5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24265323



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