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

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



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