Merge "Fix multiple control providers" into sc-dev am: 0c89ea5d0f am: 64854fb67a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359491 Change-Id: I7954facefe17117f7bb59c54de243ae03d0d846a
This commit is contained in: