Merge "fix FileNotFound exception when attempting to read bubble xml" into rvc-dev am: 750b4c93 am: 64d88bc3 am: a36e8077

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

Change-Id: Ic8d68229b9eaea3b945b8b1046f9e92c948b73b9