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

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

Change-Id: I7975a93cbbf95a0b199348e2155eff51227f9db8