Merge changes from topic "libcamera2ndk_vendor_metadata" into qt-dev
am: d023624cd9

Change-Id: Id65da3555ad158a1e64cb6cc110ef40cc5bc60bc