Merge "commonsys-intf: qdMetaData: Add get/setMetaData variants that unmap metadata" into display-android-commonsys.lnx.1.0