Merge "Fix issue #23581553: Ignore Battery Optimization not work for re-install app" into mnc-dr-dev