Fix startFaceDetection will fail after taking a picture.
Fix startFaceDetection will fail after taking a picture.

bug:6568961
Change-Id: I353c24496ec00805ed46ba90457729dfb5b2c337

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base