Merge "libstagefright: add camera owners to Camera*.h" am: 57f8d983 am: b4d245d2 am: 7c31631b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2640538



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