Merge "Remove product_is_iot." into qt-dev-plus-aosp am: 50e5baa5a2 am: adea203cb0
am: 381f6d38e0

Change-Id: I7ce4f7f069ca85f2a037415b16a6e5cb436e2cf8