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

Change-Id: I2fe46dba82675e22538c56eec1cea3f8b71391dc