Merge "Adding more test coverage for QuickSettingsController" into tm-qpr-dev am: 5a9061ee am: 9c5c15dc am: 3a81bb04 am: f360daa0

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



Change-Id: If60031746dc4ca7fcfb124961b68ba360a5ae061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>