Merge "Get the current hardware sku for the vintf files" am: 90d6f65f55 am: e82f0946ca

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

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