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