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

Merge "Fix subtle copying bug in primeShaderCache" into tm-dev am: 5b8ab38b am: 42b3ca51 am: 2f15b245 am: a8cbfa54

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



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