[automerger skipped] Merge "Flip device controls panel flag" into tm-qpr-dev...

[automerger skipped] Merge "Flip device controls panel flag" into tm-qpr-dev am: f0d88994 am: a48b72c8 -s ours

am skip reason: Merged-In Ib72bdbba304301f2c97c8af1906e26b0d5325f38 with SHA-1 70f83437 is already in history

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



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