Merge "[Ravenwood] Add framework-res.apk to ravenwood-runtime" into aosp-main-future