Merge "Change system API getDeviceId to be @NonNull" into main