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

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

Change-Id: I5800f8ad84e22a020f91cc6294a7f731a19c178b