am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization...
am b2b02092: Merge "Fix issue #23037899: Support for Battery Optimization permission + Dialog" into mnc-dev
* commit 'b2b02092':
Fix issue #23037899: Support for Battery Optimization permission + Dialog