[automerger skipped] Disable ControlsActivityTest and...

[automerger skipped] Disable ControlsActivityTest and ControlsDialogsFactoryTest tests am: af54028c -s ours am: dad311d2 -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: I8629edfe327d6cea980d7141165b1cc6faf6fffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>