Merge changes from topic "media-camera-owners" into main am: 1b7a6f59 am: d22d4227

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3012754



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