Merge "Camera: Increase precapture end timeout" am: 8e472ebb

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



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