Merge "Fix HWUI ShaderCache mIDHash eviction race" into udc-qpr-dev am: 9fb2833ffb am: 169e321cfe

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

Change-Id: I165d24546536ce7295db81d6646df797e9c21bb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>