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

Change-Id: I11d183c87e3ab5fdcf845197744c6ad807558365