[external/jetpack-camera-app] Upstream merge am: 4919941812 am: 310a14dd9e

Original change: https://android-review.googlesource.com/c/platform/external/jetpack-camera-app/+/3263806

Change-Id: I5a11c0c61dc54c3d7c026892d6fb144e1a8602e2
Signed-off-by: Automerger Merge Worker <[email protected]>