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

Change-Id: Ic0fb208b3b556269c24c8a6e8a557edf8bd917d4