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

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

Change-Id: I3bd28dfc7d512ee2ab88d41d97371d8bfb73024f