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

[automerger skipped] Merge "Reduce RM createResources lock contention" into rvc-qpr-dev-plus-aosp am: 83bf7e05 -s ours

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

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

Change-Id: I776eb02861841ee1257cbc9dcfaded3a63ccf95e