Merge "Revert "Adding multiple provider support in AbstractMasterSystem..."" into tm-dev am: 68688e2e19 am: 4f4f0900eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17060491 Change-Id: If3c861badb49fb59d1891a24d9880bbf1937a2e7
This commit is contained in: