Merge "Update the manage education to be a cling" into rvc-dev am: e2043538

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

Change-Id: I3942235e5277b7fc5420c623aa8b3cfc478200d6