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

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