Merge the two separate preference test targets

Also fix up all the style isues in the tests.

Test: atest CtsPreferenceTestCases
Change-Id: I8e3ad30e3b0a6a34621403631134cec2832bc22a
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 9042e16..d0cbaaa 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -16,6 +16,7 @@
                       tests/tests/content/
                       tests/tests/graphics/
                       tests/tests/hardware/
+                      tests/tests/preference/
                       tests/tests/print/
                       tests/tests/text/
                       tests/tests/transition/