Merge "Adding more test coverage for QuickSettingsController" into tm-qpr-dev am: 5a9061ee

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



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