Merge "Add EGL blobcache multifile properties" am: 8ccb2f12 am: 5f16d992 am: e0957eed

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



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