Merge "Fix camera launch delay from Keyguard" into oc-dev
am: 73f2a2a4d7

Change-Id: Ic7c211955b8375d08da9dfbc59c348f71c1c7552