Merge "Fix b/277880435: System battery settings app crash" into udc-dev