Merge "Make init.userspace_reboot.is_supported a rw property" am: 67ee6aeb9e am: ece1219eb9

Change-Id: I3b301c6f994007eb30210005c62ce52ce0ea16fc

core/java/android/os/PowerManager.java

@@ -29,6 +29,7 @@ import android.annotation.TestApi;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.service.dreams.Sandman;
+import android.sysprop.InitProperties;
 import android.util.ArrayMap;
 import android.util.Log;
 import android.util.proto.ProtoOutputStream;
@@ -1336,7 +1337,7 @@ public final class PowerManager {
      */
     // TODO(b/138605180): add link to documentation once it's ready.
     public boolean isRebootingUserspaceSupported() {
-        return SystemProperties.getBoolean("ro.init.userspace_reboot.is_supported", false);
+        return InitProperties.is_userspace_reboot_supported().orElse(false);
     }
 
     /**