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

Merge "Get the current hardware sku for the vintf files" am: 90d6f65f am: e82f0946 am: d47011e6 am: 15775ed4 am: 5b549c82

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



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