Merge "Add cts to test power-save-except-idle whitelist is correctly used." into oc-dev
am: e60355110f

Change-Id: I057dc702ebb67876040c3175e33e2e1654036043