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

Change-Id: I84dc34980d768ee8807c4d9b045a1971dfdbff03