Merge "Bubble manage education" into udc-qpr-dev am: 8ecd6992 am: ed548f5c

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



Change-Id: Ie8a684d4bc2b18342b58628712541da88f55742a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>