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

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



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