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