Merge "Fix parsing of power policy groups" into android12-tests-dev