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