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

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

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