Merge "Support reading vendor categories from file instead of HAL" am: 5bb9e24bef am: b65d10fcfc

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

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