Merge "Merge "Fix ownership of objects returned by VintfObject::Get*" am: 2cdd1ce6 am: 56d8c829 am: b519119e" into oc-mr1-dev-plus-aosp