[automerger skipped] Make framework-res dep in stubs explicit am: 47994f3743 am: dda67dc7d9 am: df2baa74e1 -s ours am: 2b6ad7eb35 -s ours

am skip reason: Change-Id I1829789af207cc45c49c0c68369fc7c0c085bcb0 with SHA-1 47994f3743 is in history

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

Change-Id: I57e650c428873ae484eb05399a0e150b22247905