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

* commit '09e77852d8c25854894358789807a73c3e79ddf0':
  Fix issue #23037899: Support for Battery Optimization permission + Dialog