[automerger skipped] Merge "Reduce RM createResources lock contention" into...

[automerger skipped] Merge "Reduce RM createResources lock contention" into rvc-qpr-dev am: 030e4702 -s ours am: 6a78ef52 -s ours

am skip reason: Change-Id Iccf383cb8e1a358af4f71ac242e2216dc5a19ff2 with SHA-1 88786f90 is in history

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

Change-Id: Iab05f374a1ab62fd5628835a9add993837e6a395