Merge "Allow tests to verify the result of...

Merge "Allow tests to verify the result of PrimarySwitchPreference.setSwitchEnabled()" into udc-dev am: abe2b54b am: a85e1eec

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



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