Merge "Merge "fix FileNotFound exception when attempting to read bubble xml"...

Merge "Merge "fix FileNotFound exception when attempting to read bubble xml" into rvc-dev am: 750b4c93 am: 64d88bc3 am: c112e3cb" into rvc-qpr-dev-plus-aosp am: 5cc39966

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

Change-Id: Iddfaec05bd80707bb7dd912bfe579cc633c28394