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

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

Change-Id: I74eddc40f77c0c773dfa82df9d82979861af1152