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

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

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