Merge "Add confirmation dialog when granting/revoking admin privileges." into...

Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev am: 84da1714 am: be328cb7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22618756



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