Merge "Fix Wiping and LastAttemptBeforeWipe dialog are covered by CredentialView" into udc-qpr-dev am: 7b41e4d736 am: 60aab53786

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

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