Merge "Merge "Add android.os.VintfRuntimeInfo" am: 4f8a375958 am: e0bf06dd9e am: 5fe979b404" into oc-dev-plus-aosp