Merge "Remove ControlsProviderSelectorActivity finish on...

Merge "Remove ControlsProviderSelectorActivity finish on ControlsFavoritingActivity start" into tm-qpr-dev am: 7fe1fcde am: 67ce9ee5 am: 36f6e3e2 am: d8a7d969

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



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