Merge "Consider allow-in-power-save-except-idle whitelist while updating rules." into oc-dev
am: 5ee9a1dfa3

Change-Id: I463477157db84a7496e0659fbdd60c5ad4342989