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

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

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

Change-Id: I94a91d9b79103918d78778d91926534a3bb6347a