Merge "Revert "Fixed power manager CTS test."" into pi-dev
am: ca1dcfb23e

Change-Id: Ie748557c6940961635cdd929238f1bd2070e8804