Merge "Make framework-res dep in stubs explicit" am: f0031bf353 am: dffa4110c6 am: dcd62bcecf am: 318d951bff

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

Change-Id: I008e521c712d09f61c2276fe23609113326c8a5c