Merge "Add VDM#getDisplayNameForPersistentDeviceId API" into main