Merge "Update design for Family Link supervision enrollment dialog." into qt-dev
am: 4e27d29e6d

Change-Id: I25af902f0a0f94faa8f89edf85a6657c11d6ea9d