Merge "Merge "Don't crash if we've already been educated about Bubbles." into...

Merge "Merge "Don't crash if we've already been educated about Bubbles." into rvc-dev am: 907e00b2 am: 27a183b4 am: d1a1de03" into rvc-qpr-dev-plus-aosp am: b9da2728

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

Change-Id: I0691100798ecd4f3f22a9e170419cf4eb8522d16