Merge "Make framework-res dep in stubs explicit" am: f0031bf353

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

Change-Id: Icad8a2244e01edd32dc1512e9b3f3aaacaf55d57