Merge "Merge "Remove ControlsProviderSelectorActivity finish on...

Merge "Merge "Remove ControlsProviderSelectorActivity finish on ControlsFavoritingActivity start" into tm-qpr-dev am: 7fe1fcde am: 67ce9ee5 am: 36f6e3e2 am: 269227ba" into udc-qpr-dev-plus-aosp am: 6fca55a1

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



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