Merge "KeyMint: use a smaller invalid IMEI value" into main