Merge "Fix multiple control providers" into sc-dev am: 0c89ea5d0f

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

Change-Id: Icebbf267a8faa488dbd0fb6b0d994a669fe87627