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