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

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

Change-Id: If91c56f1d671c3fbbe8045f939aa24366c54cd01