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

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



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