am 6d2be9f2: am a4dfe05b: am 543d68cc: am 194e92d3: am 50972605: Merge "Disable ignore battery optimization items that can\'t change" into mnc-dev

* commit '6d2be9f2043bbd1fb7e5afc44583c7cc80a7b1a0':
  Disable ignore battery optimization items that can't change