Merge "Add EGL blobcache multifile properties" am: 8ccb2f122c am: 5f16d9929f

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

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