Merge "Fix crash on notifcations/device admin add pages" into sc-dev am: c24d5621de
am: 338f9a4751
am: 9f8664fa75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109304 Change-Id: I786604f1bb347e0ebc949a9843797f98fb120e94
This commit is contained in: