[automerger skipped] Disable ControlsActivityTest and ControlsDialogsFactoryTest tests am: af54028c77 -s ours am: dad311d2ff -s ours am: 085c394259 -s ours

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

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

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