[automerger skipped] Merge "Don't ret admin info from...

[automerger skipped] Merge "Don't ret admin info from createAdminSupportIntent" into sc-qpr1-dev am: 66b10904 am: ed8da6fc -s ours

am skip reason: Merged-In I3ed502a078eebac62e0b8a27f6302410c22111e4 with SHA-1 1a847ee7 is already in history

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

Change-Id: I0bbed667358e5784123cbca2519810119b650104