Merge "Merge "Fix ownership of objects returned by VintfObject::Get*" am: 2cdd1ce600 am: 56d8c8297d am: b519119efd" into oc-mr1-dev-plus-aosp