Merge "Add android.os.VintfRuntimeInfo" into oc-dev
am: 1f66f42c9f

Change-Id: Idd98689a56fdac2024884e197bd74bc2864155cb