[automerger skipped] Merge "Make framework-res dep in stubs explicit am:...

[automerger skipped] Merge "Make framework-res dep in stubs explicit am: 47994f37" into mainline-prod am: 32fefc24 -s ours

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

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

Change-Id: I146969cdbe15bd3b36d701c8e9d0ca3bc47c8e9e