Merge "Don't crash if default supervision profile owner is not set" into sc-dev am: b6c64857 am: ab696e12

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13875207

Change-Id: I8ae6e332e7a2c4178c24a8159840a3d069919dfc