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

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

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

Change-Id: Id464e7a8669fbb45f189643e8eb560154c20c77b