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