Merge "Revert "Remove device/google/atv/overlay"" am: 537992a84e am: 9b3522d37b

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1559776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66ceed78a8fed2e4ac8e9065ebf6429ce93dd2d1
diff --git a/device-common.mk b/device-common.mk
index da4710b..6390261 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -43,6 +43,10 @@
 
 # Set custom settings
 DEVICE_PACKAGE_OVERLAYS := device/linaro/hikey/overlay
+ifneq (,$(filter $(TARGET_PRODUCT),hikey960_tv hikey_tv))
+# Set TV Custom Settings
+DEVICE_PACKAGE_OVERLAYS += device/google/atv/overlay
+endif
 
 #avoid usb crash
 PRODUCT_PRODUCT_PROPERTIES += \