Merge "Remove ControlsProviderSelectorActivity finish on ControlsFavoritingActivity start" into tm-qpr-dev am: 7fe1fcde3a

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

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