Merge "Fix flag manager crash" into sc-v2-dev am: 3f5835d848

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

Change-Id: Ib6be366e91dd798273aef5ff3a33bd207bda7291

packages/SystemUI/shared/src/com/android/systemui/flags/FlagManager.kt

@@ -92,9 +92,9 @@ class FlagManager constructor(
 
     /** Returns the stored value or null if not set.  */
     fun isEnabled(id: Int): Boolean? {
-        val data: String = Settings.Secure.getString(
+        val data: String? = Settings.Secure.getString(
             context.contentResolver, keyToSettingsPrefix(id))
-        if (data.isEmpty()) {
+        if (data == null || data?.isEmpty()) {
             return null
         }
         val json: JSONObject