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

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

Change-Id: I34e1bbc63f9919e616403f5b098c74cb4e91a418