Merge "Camera: Increase precapture end timeout" am: 8e472ebb am: 55b0f07b...

Merge "Camera: Increase precapture end timeout" am: 8e472ebb am: 55b0f07b am: a1b1c670 am: f9727b9e am: 0ea37f94 am: 6e48468b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2603153



Change-Id: I6b4869cf9e9f47d63c02a8dd6d17126b369de846
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>