Merge "Ignore invalid combination of PowerManager flags." into jb-mr1.1-dev