Merge "Don't treat user switch as a brightness slider interaction" into tm-qpr-dev am: 25db0bee

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



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