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

Change-Id: I0a9c3a30877d1aa54cc45a67abcd4444eebf63c4