[automerger skipped] Merge "Disable ControlsActivityTest and...

[automerger skipped] Merge "Disable ControlsActivityTest and ControlsDialogsFactoryTest tests" into tm-qpr-dev am: 9e3062fd -s ours am: f57ecad0 -s ours

am skip reason: Merged-In I992befeac6588116da03ed7869730f5b14b4e091 with SHA-1 a65f509f is already in history

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



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