Merge "Don't treat user switch as a brightness slider interaction" into...

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

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



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