Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev