Merge "Remove ControlsProviderSelectorActivity finish on ControlsFavoritingActivity start" into tm-qpr-dev am: 7fe1fcde3a am: 67ce9ee5e3 am: 7585e0b929
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23428200 Change-Id: Ife64ccc3316270837ccd39d79425d9fc7655b3b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: