Merge changes from topic "camera-explicit-deps" am: a791090aa0 am: aeea8c3d00

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2368989

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