am 5cf89a01: am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev

* commit '5cf89a011932f1af9361e7b713e33ff5c5af3e61':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog