Merge changes I2dee064c,I0edbbabf into arc-apps

* changes:
  Add DocumentsUI to device-tests suite.
  Address comment from ag/1986215/
diff --git a/tests/Android.mk b/tests/Android.mk
index 3074500..e787d63 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,5 +18,6 @@
 LOCAL_PACKAGE_NAME := DocumentsUITests
 LOCAL_INSTRUMENTATION_FOR := DocumentsUI
 LOCAL_CERTIFICATE := platform
+LOCAL_COMPATIBILITY_SUITE := device-tests
 
 include $(BUILD_PACKAGE)