Merge "Add ability for sysui/featureflags to restart android"