Merge "Fix subtle copying bug in primeShaderCache" into tm-dev am: 5b8ab38b05

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

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