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

Change-Id: Icdfd184ebf09aa0bb53f3b1d8d94a117f9c3c735