[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: 35700e13 am: 89ecd315 -s ours

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

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

Change-Id: Ie08e972e108bb9bd96080841395ae68c0372d30d