Merge "Add @TestApi to Context.updateDeviceId"