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

Change-Id: If1a4ac40d340b9bd59fda0924bbbc313dbe810c1