Merge "[Settings] Support master switch of inline toggle of Settings Injection v2"

tests/robotests/src/com/android/settings/testutils/shadow/ShadowTileUtils.java

@@ -58,7 +58,7 @@ public class ShadowTileUtils {
     }
 
     @Implementation
-    public static Bundle putBooleanToUri(Context context, Uri uri,
+    public static Bundle putBooleanToUriAndGetResult(Context context, Uri uri,
             Map<String, IContentProvider> providerMap, String key, boolean value) {
         sChecked = value;
         return sResult;