Merge "Add templates/same-app-id for autorepro - Requires "com.android.security.autorepro.submission" version 1.0.1-alpha1" into main