Merge remote-tracking branch 'aosp/upstream-main' into main am: cd16728b23

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

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