Merge "Don't crash if we've already been educated about Bubbles." into rvc-dev am: 907e00b2 am: 9717bbbe am: 996ac96e am: e3d50459

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

Change-Id: I711783dadece5189fb12945b14d0c8decfb9e270