Merge "[dice] Remove usages of the service android.hardware.security.dice"