etahamad/safetynet-fix

[old] cts fix for aosp

Shell