Enhance the options check so that if we expect to see a null
options bundle we accept a non-null but empty bundle as well.

Bug: 3412989
Change-Id: Idd0c6ad17960a24dbb69aa0eae35791ffb66f539
diff --git a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
index e2c1f66..4414617 100644
--- a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
+++ b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
@@ -151,7 +151,9 @@
 
     private void validateOptions(Bundle expectedOptions, Bundle actualOptions) {
         if (expectedOptions == null) {
-            assertNull(actualOptions);
+            if (actualOptions != null) {
+                assertTrue(actualOptions.isEmpty());
+            }
         } else {
             assertNotNull(actualOptions);
             assertEquals(expectedOptions.get(OPTION_NAME_1), actualOptions.get(OPTION_NAME_1));