Merge "Camera: Increase precapture end timeout" am: 8e472ebb2a am: 55b0f07b4a am: a1b1c670f5

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

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