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

Change-Id: I6849ea5b1fcdf49ae07e01e4a88b537feea6e8cd