Merge "Merge "android.os.VintfObject: add API for EDI." into oc-dev am: 718688f3" into oc-dev-plus-aosp