Merge "Fix NPE on guest user" into sc-dev am: 1f9e88377c
am: 5e1febaf38
am: 37bcbac813
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14505816 Change-Id: Id3fc03e09a444ecf69c59a5a218728c8fac6e414
This commit is contained in: