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

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

Change-Id: I8afffffeb9d757ecf367123cf3e507e9a6b7ef7b