am 0925db87: Merge "Rename the dont_disable_system_apps constant." into lmp-mr1-dev

* commit '0925db87150300a679090a41f6eec26aad5c75e5':
  Rename the dont_disable_system_apps constant.