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