Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev
am: 3671e9249b

Change-Id: I2ebc01dc54f654d60e03696490c681a656a7b958