Merge "Skip testing of deprecated getDeviceIdentity on new interfaces" into main