Merge "Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev am: 3671e924 am: c592c63a am: 692fee87"