Revert "Delete unused GNSS@2.0 Thermal@2.0 checks" am: 1916c4dc6d am: 05bdf65924

Change-Id: I9191d43e7ab2b9b1b95f84ec1adf393ae7e32e8b