[automerger skipped] Merge "Add android.permission.LAUNCH_CREDENTIAL_SELECTOR...

[automerger skipped] Merge "Add  android.permission.LAUNCH_CREDENTIAL_SELECTOR which is needed for GtsCredentialsTestCases" into udc-dev am: e28675e2 am: 48256c0e am: 88deec97 am: c4b51e02 -s ours

am skip reason: Merged-In I2b805541a998160313724d24ac1ba9a826fd1d25 with SHA-1 180ed3d2 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22938400



Change-Id: I44b40bcf9156c039bf49b34615a3b5ea42550ff9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>