Merge "Fix flicker for Device admin apps." into tm-dev am: e7b38f27a3

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

Change-Id: I64262a2b9e224a0f3a3b939ec15ab336eca57605