Merge "Remove ControlsProviderSelectorActivity finish on...

Merge "Remove ControlsProviderSelectorActivity finish on ControlsFavoritingActivity start" into tm-qpr-dev am: 7fe1fcde am: 67ce9ee5 am: 7585e0b9 am: 17380b15

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



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