Merge "Trim "android.permission." from permission name to reduce reporting footprint." into rvc-dev